From 516d0c43d0956678c78ce02bfdad9dd871ce7401 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Mon, 19 Feb 2007 15:52:51 +0000 Subject: [PATCH] Fix ACM build after recent grant-table code changes. Signed-off-by: Stefan Berger --- xen/acm/acm_simple_type_enforcement_hooks.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/acm/acm_simple_type_enforcement_hooks.c b/xen/acm/acm_simple_type_enforcement_hooks.c index c77023f875..80a4760055 100644 --- a/xen/acm/acm_simple_type_enforcement_hooks.c +++ b/xen/acm/acm_simple_type_enforcement_hooks.c @@ -177,7 +177,7 @@ ste_init_state(struct acm_ste_policy_buffer *ste_buf, domaintype_t *ssidrefs) ssidref_t ste_ssidref, ste_rssidref; struct domain **pd, *rdom; domid_t rdomid; - grant_entry_t sha_copy; + struct grant_entry *sha_copy; int port, i; read_lock(&domlist_lock); /* go by domain? or directly by global? event/grant list */ @@ -238,13 +238,13 @@ ste_init_state(struct acm_ste_policy_buffer *ste_buf, domaintype_t *ssidrefs) printkd("%s: Grant ... sharing for domain %x not setup!\n", __func__, (*pd)->domain_id); continue; } - for ( i = 0; i < NR_GRANT_ENTRIES; i++ ) { + for ( i = 0; i < nr_grant_frames((*pd)->grant_table); i++ ) { sha_copy = (*pd)->grant_table->shared[i]; - if ( sha_copy.flags ) { + if ( sha_copy->flags ) { printkd("%s: grant dom (%hu) SHARED (%d) flags:(%hx) dom:(%hu) frame:(%lx)\n", __func__, (*pd)->domain_id, i, sha_copy.flags, sha_copy.domid, (unsigned long)sha_copy.frame); - rdomid = sha_copy.domid; + rdomid = sha_copy->domid; if ((rdom = get_domain_by_id(rdomid)) == NULL) { printkd("%s: domain not found ERROR!\n", __func__); goto out; -- 2.30.2